Skip to content

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Oct 7, 2024

This is only used by coverage test suites where the same sources get run under different coverage modes. Restrict ignore-mode-<coverage_mode> to only coverage modes.

@rustbot
Copy link
Collaborator

rustbot commented Oct 7, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 7, 2024
@rust-log-analyzer

This comment has been minimized.

@jieyouxu jieyouxu changed the title Prune invalid ignore-mode-* directives Restrict ignore-mode-* directives Oct 7, 2024
These are only valid for coverage test modes.
@jieyouxu jieyouxu force-pushed the prune-invalid-directives branch from 534bd72 to 64efbe2 Compare October 7, 2024 05:43
@Zalathar
Copy link
Contributor

Zalathar commented Oct 7, 2024

Yeah, this seems reasonable. I implemented ignore-mode-* in the fully-general way because it was easier than not doing that, but realistically there's no foreseeable need for it in any of the other test suites.

@Zalathar Zalathar assigned Zalathar and unassigned Mark-Simulacrum Oct 7, 2024
@Zalathar
Copy link
Contributor

Zalathar commented Oct 7, 2024

Thanks!

@bors r+ rollup=always

@bors
Copy link
Collaborator

bors commented Oct 7, 2024

📌 Commit 64efbe2 has been approved by Zalathar

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#131331 (Revert "warn_old_master_branch" check)
 - rust-lang#131344 (Avoid `&Lrc<T>` in various places)
 - rust-lang#131346 (Restrict `ignore-mode-*` directives)
 - rust-lang#131353 (Add documentation for `runtest::check_rustdoc_test_option` method)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7d7b43c into rust-lang:master Oct 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
Rollup merge of rust-lang#131346 - jieyouxu:prune-invalid-directives, r=Zalathar

Restrict `ignore-mode-*` directives

This is only used by coverage test suites where the same sources get run under different coverage modes. Restrict `ignore-mode-<coverage_mode>` to only coverage modes.
@jieyouxu jieyouxu deleted the prune-invalid-directives branch October 7, 2024 14:33
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2024
Simplify the compiletest directives for ignoring coverage-test modes

Follow-up to rust-lang#131346.

Given that these directives are now restricted to ignoring coverage-test modes only, we can drop the clunky `ignore-mode-*` naming convention, and just call them `ignore-coverage-map` and `ignore-coverage-run`.

r? jieyouxu
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2024
Rollup merge of rust-lang#131400 - Zalathar:ignore-coverage, r=jieyouxu

Simplify the compiletest directives for ignoring coverage-test modes

Follow-up to rust-lang#131346.

Given that these directives are now restricted to ignoring coverage-test modes only, we can drop the clunky `ignore-mode-*` naming convention, and just call them `ignore-coverage-map` and `ignore-coverage-run`.

r? jieyouxu
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 18, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#131331 (Revert "warn_old_master_branch" check)
 - rust-lang#131344 (Avoid `&Lrc<T>` in various places)
 - rust-lang#131346 (Restrict `ignore-mode-*` directives)
 - rust-lang#131353 (Add documentation for `runtest::check_rustdoc_test_option` method)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants